From 4dfca1aa6b8df2d0b5e879a227c5be5534b2f40f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 29 Aug 2005 20:01:28 +0000 Subject: [PATCH] Construct the "Select All" menuitem from stock. 2005-08-29 Matthias Clasen * gtk/gtktextview.c (popup_targets_received): * gtk/gtkentry.c (popup_targets_received): Construct the "Select All" menuitem from stock. * gtk/stock-icons/stock_select_all_{16,24}.png: * gtk/stock-icons/Makefile.am: * gtk/gtkiconfactory.c: * gtk/gtkstock.h: * gtk/gtkstock.c: Add a "Select All" stock item. (#78545, Calum Benson) --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ docs/reference/ChangeLog | 5 +++++ docs/reference/gtk/Makefile.am | 1 + docs/reference/gtk/gtk-sections.txt | 1 + docs/reference/gtk/tmpl/gtkstock.sgml | 7 +++++++ gtk/gtkentry.c | 2 +- gtk/gtkiconfactory.c | 4 ++++ gtk/gtkstock.c | 3 ++- gtk/gtkstock.h | 1 + gtk/gtktextview.c | 2 +- gtk/stock-icons/Makefile.am | 4 ++++ gtk/stock-icons/stock_select_all_16.png | Bin 0 -> 342 bytes gtk/stock-icons/stock_select_all_24.png | Bin 0 -> 681 bytes 14 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 gtk/stock-icons/stock_select_all_16.png create mode 100644 gtk/stock-icons/stock_select_all_24.png diff --git a/ChangeLog b/ChangeLog index 2414243ba8..2918d4aa81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2005-08-29 Matthias Clasen + * gtk/gtktextview.c (popup_targets_received): + * gtk/gtkentry.c (popup_targets_received): Construct + the "Select All" menuitem from stock. + + * gtk/stock-icons/stock_select_all_{16,24}.png: + * gtk/stock-icons/Makefile.am: + * gtk/gtkiconfactory.c: + * gtk/gtkstock.h: + * gtk/gtkstock.c: Add a "Select All" stock item. (#78545, + Calum Benson) + * gtk/gtktrayicon.c: Add a pointer to the spec. * gtk/gtkstatusicon-x11.c: Add docs. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2414243ba8..2918d4aa81 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,16 @@ 2005-08-29 Matthias Clasen + * gtk/gtktextview.c (popup_targets_received): + * gtk/gtkentry.c (popup_targets_received): Construct + the "Select All" menuitem from stock. + + * gtk/stock-icons/stock_select_all_{16,24}.png: + * gtk/stock-icons/Makefile.am: + * gtk/gtkiconfactory.c: + * gtk/gtkstock.h: + * gtk/gtkstock.c: Add a "Select All" stock item. (#78545, + Calum Benson) + * gtk/gtktrayicon.c: Add a pointer to the spec. * gtk/gtkstatusicon-x11.c: Add docs. diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 7f3bd3fbb9..a6761dd46b 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,10 @@ 2005-08-29 Matthias Clasen + * gtk/Makefile.am (HTML_IMAGES): Add stock_select_all_24.png + + * gtk/gtk-sections.txt: + * gtk/tmpl/gtkstock.sgml: Add GTK_STOCK_SELECT_ALL. + * gtk/gtk.types: Add gtk_status_icon_get_type * gtk/gtk-docs.sgml: Add GtkStatusIcon diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index e469ee23fc..840646d979 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -200,6 +200,7 @@ HTML_IMAGES = \ $(top_srcdir)/gtk/stock-icons/stock_revert_rtl_24.png \ $(top_srcdir)/gtk/stock-icons/stock_save_24.png \ $(top_srcdir)/gtk/stock-icons/stock_save_as_24.png \ + $(top_srcdir)/gtk/stock-icons/stock_select_all_24.png \ $(top_srcdir)/gtk/stock-icons/stock_colorselector_24.png \ $(top_srcdir)/gtk/stock-icons/stock_color_picker_25.png \ $(top_srcdir)/gtk/stock-icons/stock_font_24.png \ diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index c3cecc2e60..b83fb13a81 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -5533,6 +5533,7 @@ GTK_STOCK_REMOVE GTK_STOCK_REVERT_TO_SAVED GTK_STOCK_SAVE GTK_STOCK_SAVE_AS +GTK_STOCK_SELECT_ALL GTK_STOCK_SELECT_COLOR GTK_STOCK_SELECT_FONT GTK_STOCK_SORT_ASCENDING diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml index 1edf2580a1..369dd8e33b 100644 --- a/docs/reference/gtk/tmpl/gtkstock.sgml +++ b/docs/reference/gtk/tmpl/gtkstock.sgml @@ -773,6 +773,13 @@ The "Save As" item. + + +The "Select All" item. + + + +@Since: 2.10 diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 986dabbcb3..7196bd69ee 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -4557,7 +4557,7 @@ popup_targets_received (GtkClipboard *clipboard, gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem); - menuitem = gtk_menu_item_new_with_mnemonic (_("Select _All")); + menuitem = gtk_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL, NULL); g_signal_connect_swapped (menuitem, "activate", G_CALLBACK (gtk_entry_select_all), entry); gtk_widget_show (menuitem); diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 9c47edef84..e028d93868 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -792,6 +792,10 @@ get_default_icons (GtkIconFactory *factory) 16, stock_zoom_fit_16, 24, stock_zoom_fit_24); + add_icon2 (factory, GTK_STOCK_SELECT_ALL, + 16, stock_select_all_16, + 24, stock_select_all_24); + /* Generic size only */ add_icon (factory, GTK_STOCK_CLEAR, 24, stock_clear_24); diff --git a/gtk/gtkstock.c b/gtk/gtkstock.c index a789eb409d..7f50d08bb5 100644 --- a/gtk/gtkstock.c +++ b/gtk/gtkstock.c @@ -323,7 +323,7 @@ static const GtkStockItem builtin_items [] = { GTK_STOCK_CLOSE, N_("_Close"), GDK_CONTROL_MASK, 'w', GETTEXT_PACKAGE }, { GTK_STOCK_CONNECT, N_("C_onnect"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_CONVERT, N_("_Convert"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_COPY, N_("_Copy"), GDK_CONTROL_MASK, 'c', GETTEXT_PACKAGE }, + { GTK_STOCK_COPY, N_("_Copy"), GDK_CONTROL_MASK, 'c', GETTEXT_PACKAGE }, { GTK_STOCK_CUT, N_("Cu_t"), GDK_CONTROL_MASK, 'x', GETTEXT_PACKAGE }, { GTK_STOCK_DELETE, N_("_Delete"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_DISCONNECT, N_("_Disconnect"), 0, 0, GETTEXT_PACKAGE }, @@ -401,6 +401,7 @@ static const GtkStockItem builtin_items [] = { GTK_STOCK_REVERT_TO_SAVED, N_("_Revert"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_SAVE, N_("_Save"), GDK_CONTROL_MASK, 's', GETTEXT_PACKAGE }, { GTK_STOCK_SAVE_AS, N_("Save _As"), 0, 0, GETTEXT_PACKAGE }, + { GTK_STOCK_SELECT_ALL, N_("Select _All"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_SELECT_COLOR, N_("_Color"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_SELECT_FONT, N_("_Font"), 0, 0, GETTEXT_PACKAGE }, { GTK_STOCK_SORT_ASCENDING, N_("_Ascending"), 0, 0, GETTEXT_PACKAGE }, diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h index d26bb4430b..7babd59e97 100644 --- a/gtk/gtkstock.h +++ b/gtk/gtkstock.h @@ -146,6 +146,7 @@ void gtk_stock_set_translate_func (const gchar *domain, #define GTK_STOCK_REVERT_TO_SAVED "gtk-revert-to-saved" #define GTK_STOCK_SAVE "gtk-save" #define GTK_STOCK_SAVE_AS "gtk-save-as" +#define GTK_STOCK_SELECT_ALL "gtk-select-all" #define GTK_STOCK_SELECT_COLOR "gtk-select-color" #define GTK_STOCK_SELECT_FONT "gtk-select-font" #define GTK_STOCK_SORT_ASCENDING "gtk-sort-ascending" diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index fb2a26f9db..a57d3840b1 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -7122,7 +7122,7 @@ popup_targets_received (GtkClipboard *clipboard, gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem); - menuitem = gtk_menu_item_new_with_mnemonic (_("Select _All")); + menuitem = gtk_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL, NULL); g_signal_connect (menuitem, "activate", G_CALLBACK (select_all_cb), text_view); gtk_widget_show (menuitem); diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index 121d3c8ca6..f29b948982 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -137,6 +137,8 @@ IMAGES = \ stock_search_24.png \ stock_search_replace_16.png \ stock_search_replace_24.png \ + stock_select_all_16.png \ + stock_select_all_24.png \ stock_sort_ascending_16.png \ stock_sort_ascending_24.png \ stock_sort_descending_16.png \ @@ -324,6 +326,8 @@ VARIABLES5 = \ stock_search_24 $(srcdir)/stock_search_24.png \ stock_search_replace_16 $(srcdir)/stock_search_replace_16.png \ stock_search_replace_24 $(srcdir)/stock_search_replace_24.png \ + stock_select_all_16 $(srcdir)/stock_select_all_16.png \ + stock_select_all_24 $(srcdir)/stock_select_all_24.png \ stock_sort_ascending_16 $(srcdir)/stock_sort_ascending_16.png \ stock_sort_ascending_24 $(srcdir)/stock_sort_ascending_24.png \ stock_sort_descending_16 $(srcdir)/stock_sort_descending_16.png \ diff --git a/gtk/stock-icons/stock_select_all_16.png b/gtk/stock-icons/stock_select_all_16.png new file mode 100644 index 0000000000000000000000000000000000000000..4938a9d3664586513aa5f2b43b37b8be0a2e5d4f GIT binary patch literal 342 zcmV-c0jd6pP)e=gc^cNeDqf5R9CxGy(K|kGK8DNd5T!f;3Ihwk_(qMi_>QyK&ihJg=(WZBOt# z4`o>*%YKmOxq)5efaCuCiJ~ar`@Z6?b%2!8aPW9uRq{O%8KP>0K z&^y~T5h<4=2l@zlXT5ffFzLXx1J?+%4(uJwE|ELjzAgrcYwrH9z!cebITA>c1VV^e oG5|D90|1%*$j%GDGv|?szsY?Sc1hrszW@LL07*qoM6N<$f`F`+?*IS* literal 0 HcmV?d00001 diff --git a/gtk/stock-icons/stock_select_all_24.png b/gtk/stock-icons/stock_select_all_24.png new file mode 100644 index 0000000000000000000000000000000000000000..5d25b70ab495e043a223baa1ac63cd665af5d78d GIT binary patch literal 681 zcmV;a0#^NrP)nr%rflG%}lPL<`d&H+Fbvp`6qKxo!kHl2@Gtj)tZ!O#y5WB*q{u9%-PF{1t<4 zGc6IIwGNUps9Wn30qQ}$qo30h3K4`^mJ)<@$h0!6KB6Mc zc2V8W%%UU~(Rxs?Hw!fp!1KJOi+ZVp_%)*}7ablR5(ELyUp@rWIFQTbu-0OXK@!H8 z#ypIdq_DRkfIR_l;^lE12V{{f)}CyN_04f;t|S!RW7aC2!H4(nID5umFyUbV2CIg} z3hTeIXPW+wlv-Ig<_$T87d%)fw`ql+>#^LJS P00000NkvXXu0mjfR